Performance improvements

  • 1